<<<<<<< HEAD
#ifndef BULLUET_H
#define BULLUET_H

#include <QObject>
#include<QPropertyAnimation>
#include<QPoint>
#include<QPixmap>
#include<QPainter>
class bullet : public QObject
{
    Q_OBJECT
    Q_PROPERTY(QPoint current_pos READ getcurrent_pos WRITE setcurrent_pos)
public:
    explicit bullet(QObject *parent = nullptr);
    bullet(QPoint start_pos,QPoint end_pos,QString filename);
    void draw(QPainter *painter);
    void move();
    QPoint getcurrent_pos();
    void setcurrent_pos(QPoint pos);
protected:
    QPoint start_pos;
    QPoint end_pos;
    QPoint current_pos;
    QPixmap picture;
signals:

};

#endif // BULLET_H
=======
#ifndef BULLUET_H
#define BULLUET_H

#include <QObject>
#include<QPropertyAnimation>
#include<QPoint>
#include<QPixmap>
#include<QPainter>
class bullet : public QObject
{
    Q_OBJECT
    Q_PROPERTY(QPoint current_pos READ getcurrent_pos WRITE setcurrent_pos)
public:
    explicit bullet(QObject *parent = nullptr);
    bullet(QPoint start_pos,QPoint end_pos,QString filename);
    void draw(QPainter *painter);
    void move();
    QPoint getcurrent_pos();
    void setcurrent_pos(QPoint pos);
protected:
    QPoint start_pos;
    QPoint end_pos;
    QPoint current_pos;
    QPixmap picture;
signals:

};

#endif // BULLET_H
>>>>>>> 199f3fb0e9bc83f97607ce663cfb658435caaa4f
